tang: Update to version 7

Added License information.

Cleaned up Makefile for consistency between packages.

Added numerical prefixes to the patches for clarity.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/utils/tang/Makefile b/utils/tang/Makefile
index 0bc686df41c5f10a19cda26757031b669ac5bbfe..aebebe27c3b76d2df24e3aa0a0390611033c85fc 100644 (file)
--- a/utils/tang/Makefile
+++ b/utils/tang/Makefile
@@ -8,17 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tang
-PKG_VERSION:=6
+PKG_VERSION:=7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=1df78b48a52d2ca05656555cfe52bd4427c884f5a54a2c5e37a7b39da9e155e3
+PKG_HASH:=fbe13e4e3103cd24cada7824b63e510cffd650832ecd075fd49b99475a4f9bfa
 
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+PKG_MAINTAINER:=Tibor Dudlák <[email protected]>
+PKG_LICENSE:=GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,7 +30,6 @@ define Package/tang
   TITLE:=tang v$(PKG_VERSION) - daemon for binding data to the presence of a third party
   DEPENDS:=+libhttp-parser +xinetd +jose +bash
   URL:=https://github.com/latchset/tang
-  MAINTAINER:=Tibor Dudlák <[email protected]>
 endef
 
 define Package/tang/description

diff --git a/utils/tang/patches/010-makefile.patch b/utils/tang/patches/010-makefile.patch
new file mode 100644 (file)
index 0000000..30a480e
--- /dev/null
+++ b/utils/tang/patches/010-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,3 @@
+-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+ BUILT_SOURCES=
+ CLEANFILES=
+ man1_MANS=
+@@ -10,13 +9,6 @@ LDADD = @jose_LIBS@ @http_parser_LIBS@
+ cachedir = $(localstatedir)/cache/$(PACKAGE_NAME)
+ jwkdir = $(localstatedir)/db/$(PACKAGE_NAME)
+ 
+-nodist_systemdsystemunit_DATA = \
+-    units/[email protected] \
+-    units/tangd.socket \
+-    units/tangd-update.path \
+-    units/tangd-update.service \
+-    units/tangd-keygen.service
+-
+ dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
+ dist_bin_SCRIPTS = src/tang-show-keys
+ libexec_PROGRAMS = src/tangd
+@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
+ AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
+ TESTS = tests/adv tests/rec
+ 
+-CLEANFILES += $(nodist_systemdsystemunit_DATA)
+ EXTRA_DIST = \
+-    $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
+     COPYING \
+     $(TESTS) \
+     $(man_ADOC_FILES)

diff --git a/utils/tang/patches/020-no-systemd.patch b/utils/tang/patches/020-no-systemd.patch
new file mode 100644 (file)
index 0000000..571c72a
--- /dev/null
+++ b/utils/tang/patches/020-no-systemd.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute],
+              [AC_MSG_ERROR([http-parser required!])])
+ 
+ PKG_CHECK_MODULES([jose], [jose >= 8])
+-PKG_CHECK_MODULES([systemd], [systemd])
+-
+-AC_ARG_WITH([systemdsystemunitdir],
+-            [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
+-            [],
+-            [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+-
+-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+-
+-for ac_prog in systemd-socket-activate systemd-activate; do
+-    AC_CHECK_PROG([SD_ACTIVATE], [$ac_prog], [$as_dir/$ac_prog], [],
+-                [$PATH$PATH_SEPARATOR$($PKG_CONFIG --variable=systemdutildir systemd)])
+-    test -n "$SD_ACTIVATE" && break
+-done
+-
+-test -n "$SD_ACTIVATE" || AC_MSG_ERROR([systemd-socket-activate required!])
+-
+-AC_MSG_CHECKING([systemd-socket-activate inetd flag])
+-if $SD_ACTIVATE --help | grep -q inetd; then
+-    SD_ACTIVATE="$SD_ACTIVATE --inetd"
+-    AC_MSG_RESULT([--inetd])
+-else
+-    AC_MSG_RESULT([(default)])
+-fi
+-
+-AC_SUBST(SD_ACTIVATE)
+ 
+ TANG_CFLAGS="\
+ -Wall \

diff --git a/utils/tang/patches/030-readlink.patch b/utils/tang/patches/030-readlink.patch
new file mode 100644 (file)
index 0000000..1a3f897
--- /dev/null
+++ b/utils/tang/patches/030-readlink.patch
@@ -0,0 +1,13 @@
+--- a/src/tangd-update
++++ b/src/tangd-update
+@@ -33,8 +33,8 @@ fi
+ 
+ [ ! -d "$2" ] && mkdir -p -m 0700 "$2"
+ 
+-src=`realpath "$1"`
+-dst=`realpath "$2"`
++src=`readlink -f "$1"`
++dst=`readlink -f "$2"`
+ 
+ payl=()
+ sign=()

diff --git a/utils/tang/patches/Makefile_am.patch b/utils/tang/patches/Makefile_am.patch
deleted file mode 100644 (file)
index 647aca5..0000000
--- a/utils/tang/patches/Makefile_am.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 14bf91d..dfa6d07 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,3 @@
--DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
--
- AM_CFLAGS = @TANG_CFLAGS@ @jose_CFLAGS@
- LDADD = @jose_LIBS@ @http_parser_LIBS@
- 
-@@ -7,21 +5,11 @@ nagiosdir = $(libdir)/nagios/plugins
- cachedir = $(localstatedir)/cache/$(PACKAGE_NAME)
- jwkdir = $(localstatedir)/db/$(PACKAGE_NAME)
- 
--nodist_systemdsystemunit_DATA = \
--    units/[email protected] \
--    units/tangd.socket \
--    units/tangd-update.path \
--    units/tangd-update.service \
--    units/tangd-keygen.service
--
- dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
- libexec_PROGRAMS = src/tangd
--nagios_PROGRAMS = src/tang
--man1_MANS = doc/tang-nagios.1
- man8_MANS = doc/tang.8
- 
- src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
--src_tang_SOURCES = src/nagios.c
- 
- %: %.in
-       $(AM_V_GEN)mkdir -p "`dirname "$@"`"
-@@ -32,11 +20,9 @@ src_tang_SOURCES = src/nagios.c
-               $(srcdir)/[email protected] > $@
- 
- AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
--TESTS = tests/adv tests/rec tests/nagios
-+TESTS = tests/adv tests/rec 
- 
--CLEANFILES = $(nodist_systemdsystemunit_DATA)
- EXTRA_DIST = \
--    $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
-     COPYING \
-     $(TESTS) \
-     $(man1_MANS) \

diff --git a/utils/tang/patches/rm-systemd-from-configure.patch b/utils/tang/patches/rm-systemd-from-configure.patch
deleted file mode 100644 (file)
index 50dc68c..0000000
--- a/utils/tang/patches/rm-systemd-from-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b51bb31..4b37d30 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute],
-              [AC_MSG_ERROR([http-parser required!])])
- 
- PKG_CHECK_MODULES([jose], [jose >= 8])
--PKG_CHECK_MODULES([systemd], [systemd])
--
--AC_ARG_WITH([systemdsystemunitdir],
--            [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
--            [],
--            [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
--
--AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
--
--for ac_prog in systemd-socket-activate systemd-activate; do
--    AC_CHECK_PROG([SD_ACTIVATE], [$ac_prog], [$as_dir/$ac_prog], [],
--                [$PATH$PATH_SEPARATOR$($PKG_CONFIG --variable=systemdutildir systemd)])
--    test -n "$SD_ACTIVATE" && break
--done
--
--test -n "$SD_ACTIVATE" || AC_MSG_ERROR([systemd-socket-activate required!])
--
--AC_MSG_CHECKING([systemd-socket-activate inetd flag])
--if $SD_ACTIVATE --help | grep -q inetd; then
--    SD_ACTIVATE="$SD_ACTIVATE --inetd"
--    AC_MSG_RESULT([--inetd])
--else
--    AC_MSG_RESULT([(default)])
--fi
--
--AC_SUBST(SD_ACTIVATE)
- 
- TANG_CFLAGS="\
- -Wall \

diff --git a/utils/tang/patches/use-readlink-in-tangd-update.patch b/utils/tang/patches/use-readlink-in-tangd-update.patch
deleted file mode 100644 (file)
index 7c07b1d..0000000
--- a/utils/tang/patches/use-readlink-in-tangd-update.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/tangd-update b/src/tangd-update
-index 652dbef..01aa842 100755
---- a/src/tangd-update
-+++ b/src/tangd-update
-@@ -33,8 +33,8 @@ fi
- 
- [ ! -d "$2" ] && mkdir -p -m 0700 "$2"
- 
--src=`realpath "$1"`
--dst=`realpath "$2"`
-+src=`readlink -f "$1"`
-+dst=`readlink -f "$2"`
- 
- payl=()
- sign=()